From 0a9a2f43e06d7a6b881507c0ab8894448dcf2c42 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 5 Dec 2008 15:43:06 +0900 Subject: [PATCH] IA64: eliminate NR_IRQ_VECTORS. ia64 part. This is ia64 counter part of 18802:935bd48f096a which eliminates NR_IRQ_VECTORS. Signed-off-by: Isaku Yamahata --- xen/drivers/passthrough/vtd/ia64/vtd.c | 2 +- xen/include/asm-ia64/hvm/irq.h | 2 +- xen/include/asm-ia64/linux/asm/irq.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c b/xen/drivers/passthrough/vtd/ia64/vtd.c index b0abcf6929..eac01a81d2 100644 --- a/xen/drivers/passthrough/vtd/ia64/vtd.c +++ b/xen/drivers/passthrough/vtd/ia64/vtd.c @@ -31,7 +31,7 @@ int vector_irq[NR_VECTORS] __read_mostly = { [0 ... NR_VECTORS - 1] = -1}; /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */ -u8 irq_vector[NR_IRQ_VECTORS] __read_mostly; +u8 irq_vector[NR_IRQS] __read_mostly; void *map_vtd_domain_page(u64 maddr) { diff --git a/xen/include/asm-ia64/hvm/irq.h b/xen/include/asm-ia64/hvm/irq.h index 32d0164101..758d8c7ddd 100644 --- a/xen/include/asm-ia64/hvm/irq.h +++ b/xen/include/asm-ia64/hvm/irq.h @@ -98,7 +98,7 @@ irq_to_vector (int irq) } -extern u8 irq_vector[NR_IRQ_VECTORS]; +extern u8 irq_vector[NR_IRQS]; extern int vector_irq[NR_VECTORS]; #endif /* __ASM_IA64_HVM_IRQ_H__ */ diff --git a/xen/include/asm-ia64/linux/asm/irq.h b/xen/include/asm-ia64/linux/asm/irq.h index c0fd725c0d..9a1c1d0b4b 100644 --- a/xen/include/asm-ia64/linux/asm/irq.h +++ b/xen/include/asm-ia64/linux/asm/irq.h @@ -13,7 +13,6 @@ #define NR_VECTORS 256 #define NR_IRQS 256 -#define NR_IRQ_VECTORS NR_IRQS static __inline__ int irq_canonicalize (int irq) -- 2.30.2